From 77782154940cfbd468f01d3fb57b8fd8514320e3 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 14 Mar 2017 21:35:33 +0000
Subject: [PATCH] userns: Avoid ABI change for CVE-2017-6874 fix

The type of ucounts::count changed from atomic_t to int.  But they're
the same size, and it's only accessed within kernel/ucount.c, so hide
the change from genksyms.


Gbp-Pq: Topic debian
Gbp-Pq: Name userns-avoid-abi-change-for-cve-2017-6874-fix.patch
---
 include/linux/user_namespace.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index dc797739f16..6d77349de3d 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -65,7 +65,11 @@ struct ucounts {
 	struct hlist_node node;
 	struct user_namespace *ns;
 	kuid_t uid;
+#ifdef __GENKSYMS__
+	atomic_t count;
+#else
 	int count;
+#endif
 	atomic_t ucount[UCOUNT_COUNTS];
 };
 
-- 
2.30.2